新增用户管理和vpn服务器ip功能
This commit is contained in:
leijun
@@ -103,6 +103,7 @@ import com.nis.web.service.RoleService;
|
||||
import com.nis.web.service.SystemService;
|
||||
import com.nis.web.service.UserService;
|
||||
import com.nis.web.service.basics.AsnIpCfgService;
|
||||
import com.nis.web.service.basics.IpReuseIpCfgService;
|
||||
import com.nis.web.service.basics.PolicyGroupInfoService;
|
||||
import com.nis.web.service.basics.ServiceDictInfoService;
|
||||
import com.nis.web.service.basics.SysDictInfoService;
|
||||
@@ -132,6 +133,7 @@ import com.nis.web.service.configuration.NumCfgService;
|
||||
import com.nis.web.service.configuration.ProxyFileStrategyService;
|
||||
import com.nis.web.service.configuration.PxyObjKeyringService;
|
||||
import com.nis.web.service.configuration.RequestInfoService;
|
||||
import com.nis.web.service.configuration.UserManageService;
|
||||
import com.nis.web.service.configuration.WebsiteCfgService;
|
||||
import com.nis.web.service.configuration.XmppCfgService;
|
||||
import com.nis.web.service.configuration.statistics.ConfigureStatisticsService;
|
||||
@@ -254,6 +256,11 @@ public class BaseController {
|
||||
protected CachePolicyService cachePolicyService;
|
||||
@Autowired
|
||||
protected ConfigSynchronizationService configSynchronizationService;
|
||||
|
||||
@Autowired
|
||||
protected UserManageService userManageService;
|
||||
@Autowired
|
||||
protected IpReuseIpCfgService ipReuseIpCfgService;
|
||||
/**
|
||||
* 管理基础路径
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
package com.nis.web.controller.basics;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
import com.nis.domain.FunctionRegionDict;
|
||||
import com.nis.domain.FunctionServiceDict;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.basics.IpReuseIpCfg;
|
||||
import com.nis.domain.configuration.CfgIndexInfo;
|
||||
import com.nis.exceptions.MaatConvertException;
|
||||
import com.nis.util.DictUtils;
|
||||
import com.nis.web.controller.BaseController;
|
||||
@Controller
|
||||
@RequestMapping(value = "${adminPath}/basics/vpn")
|
||||
public class IpReuseIpCfgController extends BaseController{
|
||||
@RequestMapping(value = {"/list"})
|
||||
public String list(Model model,HttpServletRequest request
|
||||
,HttpServletResponse response,@ModelAttribute("cfg")IpReuseIpCfg entity
|
||||
,RedirectAttributes redirectAttributes){
|
||||
Page<IpReuseIpCfg> page = ipReuseIpCfgService.findPage(new Page<IpReuseIpCfg>(request, response,"r"), entity);
|
||||
model.addAttribute("page", page);
|
||||
|
||||
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
|
||||
model.addAttribute("regionList", regionList);
|
||||
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
|
||||
model.addAttribute("serviceList", serviceList);
|
||||
|
||||
return "/basics/userIpCfgList";
|
||||
}
|
||||
@RequestMapping(value = {"/addForm"})
|
||||
public String addForm(Model model,HttpServletRequest request
|
||||
,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg
|
||||
,RedirectAttributes redirectAttributes){
|
||||
initFormCondition(model,cfg);
|
||||
model.addAttribute("_cfg", cfg);
|
||||
return "/basics/userIpCfgFormAdd";
|
||||
}
|
||||
@RequestMapping(value = {"/updateForm"})
|
||||
@RequiresPermissions(value={"other:bgp:config"})
|
||||
public String updateForm(Model model,HttpServletRequest request
|
||||
,HttpServletResponse response,String ids,@ModelAttribute("cfg")IpReuseIpCfg cfg
|
||||
,RedirectAttributes redirectAttributes){
|
||||
if(StringUtils.isNotBlank(ids)){
|
||||
cfg = ipReuseIpCfgService.getUserIpCfg(Long.parseLong(ids));
|
||||
initUpdateFormCondition(model,cfg);
|
||||
}else{
|
||||
initFormCondition(model,cfg);
|
||||
}
|
||||
model.addAttribute("_cfg", cfg);
|
||||
return "/basics/userIpCfgFormUpdate";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@RequestMapping(value = {"save"})
|
||||
@RequiresPermissions(value={"other:bgp:config"})
|
||||
public String saveBgpCfg(Model model,HttpServletRequest request,HttpServletResponse response
|
||||
,String ids,CfgIndexInfo entity
|
||||
,RedirectAttributes redirectAttributes) {
|
||||
try{
|
||||
ipReuseIpCfgService.save(entity);;
|
||||
addMessage(redirectAttributes,"save_success");
|
||||
}catch(Exception e){
|
||||
logger.error("信息保存失败",e);
|
||||
e.printStackTrace();
|
||||
addMessage(redirectAttributes,"save_failed");
|
||||
}
|
||||
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+entity.getFunctionId();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@RequestMapping(value = {"/update"})
|
||||
@RequiresPermissions(value={"asn:ip:config"})
|
||||
public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")IpReuseIpCfg cfg,RedirectAttributes redirectAttributes){
|
||||
try{
|
||||
ipReuseIpCfgService.update(cfg);
|
||||
addMessage(redirectAttributes,"save_success");
|
||||
}catch(Exception e){
|
||||
logger.error("信息保存失败",e);
|
||||
e.printStackTrace();
|
||||
addMessage(redirectAttributes,"save_failed");
|
||||
}
|
||||
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+cfg.getFunctionId();
|
||||
}
|
||||
@RequestMapping(value = {"/delete"})
|
||||
@RequiresPermissions(value={"asn:ip:config"})
|
||||
public String delete(Integer isValid
|
||||
,String ids,Integer functionId
|
||||
,RedirectAttributes redirectAttributes){
|
||||
try{
|
||||
ipReuseIpCfgService.delete(isValid,ids);
|
||||
addMessage(redirectAttributes,"delete_success");
|
||||
}catch(Exception e){
|
||||
logger.error("Delete failed",e);
|
||||
if(e instanceof MaatConvertException) {
|
||||
addMessage(redirectAttributes,e.getMessage());
|
||||
}else {
|
||||
addMessage(redirectAttributes,"delete_failed");
|
||||
}
|
||||
}
|
||||
|
||||
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+functionId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证登录名是否有效
|
||||
* @param oldLoginName
|
||||
* @param loginName
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@RequiresPermissions("user:manage:edit")
|
||||
@RequestMapping(value = "checkIp")
|
||||
public String checkIp(String oldDestIpAddress, String destIpAddress) {
|
||||
if (destIpAddress !=null && destIpAddress.equals(oldDestIpAddress)) {
|
||||
return "true";
|
||||
} else if (destIpAddress !=null && ipReuseIpCfgService.getIpByIp(destIpAddress) == null) {
|
||||
return "true";
|
||||
}
|
||||
return "false";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,177 @@
|
||||
package com.nis.web.controller.configuration.maintenance;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.basics.IpReuseIpCfg;
|
||||
import com.nis.domain.configuration.UserManage;
|
||||
import com.nis.exceptions.MaatConvertException;
|
||||
import com.nis.util.StringUtils;
|
||||
import com.nis.web.controller.BaseController;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("${adminPath}/maintenance/userManage")
|
||||
public class UserManageController extends BaseController{
|
||||
|
||||
@RequestMapping(value = {"/list"})
|
||||
@RequiresPermissions(value={"user:manage:view"})
|
||||
public String list(Model model,HttpServletRequest request,HttpServletResponse response
|
||||
,@ModelAttribute("cfg")UserManage entity
|
||||
,RedirectAttributes redirectAttributes){
|
||||
Page<UserManage> page = userManageService.findPage(new Page<UserManage>(request, response,"r"), entity);
|
||||
model.addAttribute("page", page);
|
||||
// initPageCondition(model,entity);
|
||||
return "/cfg/maintenance/userManage/list";
|
||||
}
|
||||
|
||||
/**
|
||||
* 进入用户添加或修改页面
|
||||
* @param user
|
||||
* @param model
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value={"form"})
|
||||
@RequiresPermissions(value={"user:manage:config"})
|
||||
public String form(UserManage user, Model model,String ids) {
|
||||
if(StringUtils.isNotBlank(ids)){
|
||||
user = userManageService.getUserById(ids);
|
||||
}
|
||||
model.addAttribute("user", user);
|
||||
return "/cfg/maintenance/userManage/userForm";
|
||||
}
|
||||
|
||||
@RequestMapping(value = {"/delete"})
|
||||
@RequiresPermissions(value={"user:manage:config"})
|
||||
public String delete(Integer isValid
|
||||
,String ids
|
||||
,RedirectAttributes redirectAttributes){
|
||||
try{
|
||||
userManageService.delete(isValid,ids);
|
||||
addMessage(redirectAttributes,"delete_success");
|
||||
}catch(Exception e){
|
||||
logger.error("Delete failed",e);
|
||||
if(e instanceof MaatConvertException) {
|
||||
addMessage(redirectAttributes,e.getMessage());
|
||||
}else {
|
||||
addMessage(redirectAttributes,"delete_failed");
|
||||
}
|
||||
}
|
||||
|
||||
return "redirect:" + adminPath +"/maintenance/userManage/list";
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping(value = {"save"})
|
||||
@RequiresPermissions(value={"user:manage:config"})
|
||||
public String save(Model model,HttpServletRequest request,HttpServletResponse response
|
||||
,String ids,UserManage entity
|
||||
,RedirectAttributes redirectAttributes) {
|
||||
try{
|
||||
userManageService.save(entity,model,request);
|
||||
addMessage(redirectAttributes,"save_success");
|
||||
}catch(Exception e){
|
||||
logger.error("信息保存失败",e);
|
||||
e.printStackTrace();
|
||||
addMessage(redirectAttributes,"save_failed");
|
||||
}
|
||||
return "redirect:" + adminPath +"/maintenance/userManage/list";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 验证登录名是否有效
|
||||
* @param oldLoginName
|
||||
* @param loginName
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@RequiresPermissions("user:manage:edit")
|
||||
@RequestMapping(value = "checkLoginName")
|
||||
public String checkLoginName(String oldUserName, String userName) {
|
||||
if (userName !=null && userName.equals(oldUserName)) {
|
||||
return "true";
|
||||
} else if (userName !=null && userManageService.getUserByLoginName(userName) == null) {
|
||||
return "true";
|
||||
}
|
||||
return "false";
|
||||
}
|
||||
|
||||
/**
|
||||
* 父节点选择树形结构
|
||||
* @param extId排除节点id
|
||||
* @param isShowHide
|
||||
* @param isLeafShow:叶子节点是否显示
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@RequestMapping(value = "treeData")
|
||||
public List<Map<String, Object>> treeData(@RequestParam(required=false)Boolean specific,@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide,
|
||||
@RequestParam(required=false)boolean isLeafShow,@RequestParam(required=true)Integer cfgType,HttpServletResponse response){
|
||||
List<Map<String, Object>> mapList = Lists.newArrayList();
|
||||
Map<String, Object> map2 = Maps.newHashMap();
|
||||
map2.put("id", 0);
|
||||
map2.put("pId", 0);
|
||||
map2.put("groupId",0);
|
||||
map2.put("name","root_node");
|
||||
mapList.add(map2);
|
||||
IpReuseIpCfg ip=new IpReuseIpCfg();
|
||||
ip.setFunctionId(636);
|
||||
List<IpReuseIpCfg> list=ipReuseIpCfgService.findList(ip);
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
IpReuseIpCfg ipReuseIpCfg=list.get(i);
|
||||
Map<String, Object> map = Maps.newHashMap();
|
||||
map.put("id", ipReuseIpCfg.getDestIpAddress());
|
||||
map.put("pId", 0);
|
||||
map.put("name",ipReuseIpCfg.getDestIpAddress());
|
||||
mapList.add(map);
|
||||
}
|
||||
return mapList;
|
||||
}
|
||||
|
||||
@ResponseBody
|
||||
@RequestMapping(value = "userInfo")
|
||||
public List<UserManage> getUserInfo(String serverIp,HttpServletRequest request,HttpServletResponse response){
|
||||
String[] ipArray = serverIp.split(",");
|
||||
List<UserManage> userManageList=new ArrayList<UserManage>();
|
||||
for(String ip :ipArray){
|
||||
UserManage user=new UserManage();
|
||||
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
|
||||
//根据ip调用接口获取数据
|
||||
//user=userManageService.getUserManage(ip, request);
|
||||
if(ipReuseIpCfg!=null){
|
||||
user.setServerIp(ipReuseIpCfg.getDestIpAddress());
|
||||
user.setRemarks(ipReuseIpCfg.getCfgDesc());
|
||||
userManageList.add(user);
|
||||
}
|
||||
}
|
||||
return userManageList;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "view")
|
||||
@RequiresPermissions(value={"user:manage:config"})
|
||||
public String view(String serverIp,String userName,HttpServletResponse response,Model model){
|
||||
UserManage user=new UserManage();
|
||||
user=userManageService.getUserByLoginName(userName);
|
||||
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(serverIp);
|
||||
if(ipReuseIpCfg!=null){
|
||||
user.setServerIp(ipReuseIpCfg.getDestIpAddress());
|
||||
user.setRemarks(ipReuseIpCfg.getCfgDesc());
|
||||
}
|
||||
model.addAttribute("user", user);
|
||||
return "/cfg/maintenance/userManage/userView";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user