IP类配置提交

This commit is contained in:
wangxin
2018-02-25 18:43:20 +08:00
parent 1c93923000
commit 6647314e2b
16 changed files with 1411 additions and 107 deletions

View File

@@ -1,5 +1,8 @@
package com.nis.web.controller.configuration;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -8,11 +11,14 @@ 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 com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.ServiceDictInfo;
import com.nis.util.Constants;
import com.nis.web.controller.BaseController;
/**
@@ -23,11 +29,9 @@ import com.nis.web.controller.BaseController;
@Controller
@RequestMapping("${adminPath}/cfg/ip")
public class IpCfgController extends BaseController{
// @Autowired
// protected IpCfgService ipCfgService;
@RequestMapping(value = {"ipWhiteList"})
public String ipWhiteList() {
public String ipWhiteList(Model model,BaseIpCfg baseIpCfg,HttpServletRequest request,HttpServletResponse response) {
return "/cfg/ipWhiteList";
}
@@ -37,34 +41,52 @@ public class IpCfgController extends BaseController{
return "/cfg/ipWhiteForm";
}
@RequestMapping(value = {"ipBlockList"})
public String ipBlockList(Model model,BaseIpCfg baseIpCfg,HttpServletRequest request,HttpServletResponse response) {
if(baseIpCfg!=null){
Integer serviceId=baseIpCfg.getServiceId();
logger.info("sercice id is "+serviceId);
@RequestMapping(value = {"ipCfgList"})
public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
if(ipCfg!=null){
Integer serviceId=ipCfg.getServiceId();
logger.info("servcice id is "+serviceId);
if(serviceId!=null){
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
String tableName=serviceConfigInfo.getTableName();
if(!StringUtils.isBlank(tableName)){
logger.info("table name is "+tableName);
baseIpCfg.setTableName(tableName);
Page<BaseIpCfg> page = ipCfgService.findPage(new Page<BaseIpCfg>(request, response, 1), baseIpCfg);
ipCfg.setTableName(tableName);
Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request, response, 1);
if(pageNo!=null) searchPage.setPageNo(pageNo);
if(pageSize!=null) searchPage.setPageSize(pageSize);
if(ipCfg.getPage()!=null){
if(!StringUtils.isBlank(ipCfg.getPage().getOrderBy()));
searchPage.setOrderBy(ipCfg.getPage().getOrderBy());
}
Page<BaseIpCfg> page = ipCfgService.findPage(searchPage, ipCfg);
model.addAttribute("page", page);
model.addAttribute("serviceId", serviceId);
model.addAttribute("cfgName", cfgName);
model.addAttribute("action", ipCfg.getAction());
List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
model.addAttribute("requestInfos", requestInfos);
List<ServiceDictInfo> fls=serviceDictInfoService.findFlDict();
model.addAttribute("fls", fls);
List<ServiceDictInfo> xzs=serviceDictInfoService.findXzDict();
model.addAttribute("xzs", xzs);
List<ServiceDictInfo> lables=serviceDictInfoService.findLableDict();
model.addAttribute("lables", lables);
}
}else{
logger.error("未获取到正确的serviceId");
}
}
}
return "/cfg/ipBlockList";
return "/cfg/ipCfgList";
}
@RequestMapping(value = {"ipBlockForm"})
public String ipBlockForm(Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
@RequestMapping(value = {"ipCfgForm"})
public String ipCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
logger.info("sercice id is "+serviceId);
System.out.println("ipBlockForm loaded");
if(serviceId!=null){
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
@@ -80,7 +102,18 @@ public class IpCfgController extends BaseController{
BaseIpCfg ipcfg=(BaseIpCfg)clazz.newInstance();
ipcfg.setTableName(tableName);
ipcfg.initDefaultValue();
ipcfg.setAction(action);
ipcfg.setServiceId(serviceId);
model.addAttribute("_ipCfg", ipcfg);
model.addAttribute("cfgName", cfgName);
List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
model.addAttribute("requestInfos", requestInfos);
List<ServiceDictInfo> fls=serviceDictInfoService.findFlDict();
model.addAttribute("fls", fls);
List<ServiceDictInfo> xzs=serviceDictInfoService.findXzDict();
model.addAttribute("xzs", xzs);
List<ServiceDictInfo> lables=serviceDictInfoService.findLableDict();
model.addAttribute("lables", lables);
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
// TODO Auto-generated catch block
logger.error("打开新增IP窗口失败",e);
@@ -88,25 +121,293 @@ public class IpCfgController extends BaseController{
}
}
}
}else{
logger.error("未获取到正确的serviceId");
}
return "/cfg/ipBlockForm";
return "/cfg/ipCfgForm";
}
@RequestMapping(value = {"updateIpCfgForm"})
public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
if(!StringUtils.isBlank(tableName)){
logger.info("table name is "+tableName);
BaseIpCfg searchBean=new BaseIpCfg();
searchBean.setCfgId(cfgId);
searchBean.setTableName(tableName);
BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean);
model.addAttribute("_ipCfg", ipCfg);
model.addAttribute("cfgName", cfgName);
List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
model.addAttribute("requestInfos", requestInfos);
List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
model.addAttribute("fls", fls);
List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
model.addAttribute("xzs", xzs);
List<ServiceDictInfo> lables=serviceDictInfoService.findAllLableDict();
model.addAttribute("lables", lables);
}else if(serviceId!=null){
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
tableName=serviceConfigInfo.getTableName();
if(!StringUtils.isBlank(tableName)){
logger.info("table name is "+tableName);
BaseIpCfg searchBean=new BaseIpCfg();
searchBean.setCfgId(cfgId);
searchBean.setTableName(tableName);
BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean);
model.addAttribute("_ipCfg", ipCfg);
model.addAttribute("cfgName", cfgName);
List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
model.addAttribute("requestInfos", requestInfos);
List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
model.addAttribute("fls", fls);
List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
model.addAttribute("xzs", xzs);
List<ServiceDictInfo> lables=serviceDictInfoService.findAllLableDict();
model.addAttribute("lables", lables);
}
}
}else{
logger.error("未获取到正确的表名");
}
return "/cfg/ipCfgForm";
}
/**
*
* addIpPortCfg(新增IP配置)
* addIpCfg(新增IP配置)
* (这里描述这个方法适用条件 可选)
* @return
*String
* @exception
* @since 1.0.0
*/
@RequestMapping(method=RequestMethod.POST,value = {"addIpCfg"})
public String addIpCfg(@ModelAttribute("ipCfg") BaseIpCfg ipCfg) {
if(ipCfg!=null&&!StringUtils.isBlank(ipCfg.getTableName())){
int result=ipCfgService.addIpCfg(ipCfg);
@RequestMapping(value = {"saveOrUpdateIpCfg"})
public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg) {
logger.info("saveOrUpdateIpCfg loaded");
if(ipCfg==null){
logger.error("无法保存空的配置!");
addMessage(model,"保存失败!");
}else if(!StringUtils.isBlank(ipCfg.getTableName())){
int serviceId=ipCfg.getServiceId();
long compileId=getCompileId(ipCfg);
ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
ipCfg.setCreateTime(new Date());
ipCfg.setIsValid(Constants.VALID_NO);
ipCfg.setIsAudit(Constants.AUDIT_NOT_YET);
ipCfg.setCompileId(compileId);
if(ipCfg.getCfgId()==null)
ipCfgService.addIpCfg(ipCfg);
else
ipCfgService.updateIpCfg(ipCfg);
model.addAttribute("serviceId",serviceId);
model.addAttribute("action",ipCfg.getAction());
model.addAttribute("cfgName",cfgName);
addMessage(model,"保存成功,正在为您跳转页面...");
}else if(ipCfg.getServiceId()!=null){
int serviceId=ipCfg.getServiceId();
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
String tableName=serviceConfigInfo.getTableName();
if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(ipCfg);
ipCfg.setTableName(tableName);
ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
ipCfg.setCreateTime(new Date());
ipCfg.setIsValid(Constants.VALID_NO);
ipCfg.setIsAudit(Constants.AUDIT_NOT_YET);
ipCfg.setCompileId(compileId);
if(ipCfg.getCfgId()==null)
ipCfgService.addIpCfg(ipCfg);
else
ipCfgService.updateIpCfg(ipCfg);
model.addAttribute("serviceId",serviceId);
model.addAttribute("action",ipCfg.getAction());
model.addAttribute("cfgName",cfgName);
addMessage(model,"保存成功,正在为您跳转页面...");
}
}
}else{
addMessage(model,"保存失败!");
logger.error("无法确定IP配置的表名");
}
return "/cfg/ipBlockForm";
return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName="+cfgName);
}
/**
*
* updateIpCfg(更新IP配置)
* (这里描述这个方法适用条件 可选)
* @return
*String
* @exception
* @since 1.0.0
*/
// @RequestMapping(value = {"updateIpCfg"})
// public String updateIpCfg(@ModelAttribute("ipCfg") BaseIpCfg ipCfg) {
// if(ipCfg==null){
// logger.error("无法修改空的配置!");
// }else if(!StringUtils.isBlank(ipCfg.getTableName())){
// int audit=ipCfgService.getIsAudit(ipCfg);
// //审核未通过方可修改
// if(audit==Constants.AUDIT_NO){
// ipCfg.setEditorId(ipCfg.getCurrentUser().getId());
// ipCfg.setEditTime(new Date());
// int result=ipCfgService.updateIpCfg(ipCfg);
// }else{
// logger.warn("审核未通过配置方可修改!");
// }
// }else if(ipCfg.getServiceId()!=null){
// int serviceId=ipCfg.getServiceId();
// ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
// if(serviceConfigInfo!=null){
// String tableName=serviceConfigInfo.getTableName();
// if(!StringUtils.isBlank(tableName)){
// ipCfg.setTableName(tableName);
// int audit=ipCfgService.getIsAudit(ipCfg);
// //审核未通过方可修改
// if(audit==Constants.AUDIT_NO){
// ipCfg.setEditorId(ipCfg.getCurrentUser().getId());
// ipCfg.setEditTime(new Date());
// int result=ipCfgService.updateIpCfg(ipCfg);
// }else{
// logger.warn("审核未通过配置方可修改!");
// }
// }
// }
// }else{
// logger.error("无法确定IP配置的表名");
// }
// return "/cfg/resultPage";
// }
/**
*
* auditIpCfg(审核IP配置)
* (这里描述这个方法适用条件 可选)
* @return
*String
* @exception
* @since 1.0.0
*/
@RequestMapping(value = {"auditIpCfg"})
public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) {
if(ipCfg==null){
logger.error("无法审核空的配置!");
}else if(!StringUtils.isBlank(ipCfg.getTableName())){
int audit=ipCfgService.getIsAudit(ipCfg);
if(audit==Constants.AUDIT_YES&&ipCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过!");
}else{
ipCfg.setAuditorId(ipCfg.getCurrentUser().getId());
ipCfg.setAuditTime(new Date());
if(ipCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过设置有效标志为0
ipCfg.setIsValid(Constants.VALID_NO);
}else if(ipCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过设置有效标志为1
ipCfg.setIsValid(Constants.VALID_YES);
}
int result=ipCfgService.auditIpCfg(ipCfg);
}
}else if(ipCfg.getServiceId()!=null){
int serviceId=ipCfg.getServiceId();
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
String tableName=serviceConfigInfo.getTableName();
if(!StringUtils.isBlank(tableName)){
ipCfg.setTableName(tableName);
int audit=ipCfgService.getIsAudit(ipCfg);
if(audit==Constants.AUDIT_YES&&ipCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过!");
}else{
ipCfg.setAuditorId(ipCfg.getCurrentUser().getId());
ipCfg.setAuditTime(new Date());
if(ipCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过设置有效标志为0
ipCfg.setIsValid(Constants.VALID_NO);
}else if(ipCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过设置有效标志为1
ipCfg.setIsValid(Constants.VALID_YES);
}
int result=ipCfgService.auditIpCfg(ipCfg);
}
}
}
}else{
logger.error("无法确定IP配置的表名");
}
return "redirect:" + adminPath + "/cfg/ip/ipCfgList?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName;
}
/**
*
* auditIpCfg(删除IP配置逻辑删除)
* (这里描述这个方法适用条件 可选)
* @return
*String
* @exception
* @since 1.0.0
*/
@RequestMapping(value = {"deleteIpCfg"})
public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) {
if(!StringUtils.isBlank(tableName)){
int audit=ipCfgService.getIsAudit(tableName,cfgId);
//未审核时可删除
if(audit!=Constants.AUDIT_YES){
BaseIpCfg ipCfg=new BaseIpCfg();
ipCfg.setCfgId(cfgId);
ipCfg.setTableName(tableName);
ipCfg.setEditorId(ipCfg.getCurrentUser().getId());
ipCfg.setEditTime(new Date());
ipCfg.setIsValid(Constants.VALID_DEL);
int result=ipCfgService.deleteIpCfg(ipCfg);
model.addAttribute("serviceId", serviceId);
model.addAttribute("cfgName", cfgName);
model.addAttribute("action", action);
addMessage(model,"删除成功,正在为您跳转页面...");
}else{
logger.error("通过审核的配置不能删除!");
}
}else if(serviceId!=null){
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
tableName=serviceConfigInfo.getTableName();
if(!StringUtils.isBlank(tableName)){
BaseIpCfg ipCfg=new BaseIpCfg();
ipCfg.setCfgId(cfgId);
ipCfg.setTableName(tableName);
int audit=ipCfgService.getIsAudit(ipCfg);
//未审核时可删除
if(audit!=Constants.AUDIT_YES){
ipCfg.setEditorId(ipCfg.getCurrentUser().getId());
ipCfg.setEditTime(new Date());
ipCfg.setIsValid(Constants.VALID_DEL);
int result=ipCfgService.deleteIpCfg(ipCfg);
model.addAttribute("serviceId", serviceId);
model.addAttribute("cfgName", cfgName);
model.addAttribute("action", action);
addMessage(model,"删除成功,正在为您跳转页面...");
}else{
logger.error("通过审核的配置不能删除!");
}
}
}
}else{
logger.error("无法确定IP配置的表名");
}
return "/cfg/resultPage";
}
/**
*
* getCompileId(获取编译ID)
* (这里描述这个方法适用条件 可选)
* @return
*long
* @exception
* @since 1.0.0
*/
protected long getCompileId(BaseCfg cfg){
return 0;
}
}