Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/web/controller/BaseController.java

@@ -31,9 +31,12 @@ import com.nis.web.service.configuration.FtpCfgService;
 import com.nis.web.service.configuration.IpCfgService;
 import com.nis.web.service.configuration.MailCfgService;
 import com.nis.web.service.configuration.MediaCfgService;
+import com.nis.web.service.configuration.ServiceDictInfoService;
 import com.nis.web.service.configuration.SslCfgService;
+import com.nis.web.service.configuration.SysDictInfoService;
 import com.nis.web.service.configuration.TunnelCfgService;
 import com.nis.web.service.configuration.WebCfgService;
+import com.nis.web.service.systemService.ServiceConfigInfoService;
 import com.nis.web.service.systemService.SystemServiceService;
 
 public class BaseController {
@@ -92,9 +95,16 @@ public class BaseController {
 	@Autowired
 	protected SystemServiceService systemServiceService;
 	
+	@Autowired
+	protected ServiceDictInfoService serviceDictInfoService;
+	
+	@Autowired
+	protected SysDictInfoService sysDictInfoService;
+	
 	protected final Logger logger = Logger.getLogger(this.getClass());
 	
-	
+	@Autowired
+	protected ServiceConfigInfoService serviceConfigInfoService;
 	/**
 	 * 管理基础路径
 	 */

src/main/java/com/nis/web/controller/configuration/IpCfgController.java

@@ -1,7 +1,19 @@
 package com.nis.web.controller.configuration;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 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.BaseIpCfg;
+import com.nis.web.controller.BaseController;
 
 /**
  * IP相关配置控制类
@@ -10,8 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 @Controller
 @RequestMapping("${adminPath}/cfg/ip")
-public class IpCfgController {
-	
+public class IpCfgController extends BaseController{
+//	@Autowired 
+//	protected IpCfgService ipCfgService;
 	
 	@RequestMapping(value = {"ipWhiteList"})
 	public String ipWhiteList() {
@@ -24,15 +37,75 @@ public class IpCfgController {
 		return "/cfg/ipWhiteForm";
 	}
 	
-
 	@RequestMapping(value = {"ipBlockList"})
-	public String 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);
+			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);
+						model.addAttribute("page", page);
+						model.addAttribute("serviceId", serviceId);
+					}
+				}
+			}
+		}
+		
 		return "/cfg/ipBlockList";
 	}
 	
 
 	@RequestMapping(value = {"ipBlockForm"})
-	public String ipBlockForm() {
+	public String ipBlockForm(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){
+				String tableName=serviceConfigInfo.getTableName();
+				if(!StringUtils.isBlank(tableName)){
+					logger.info("table name is "+tableName);
+					String className=ipCfgService.getClassName(tableName);
+					logger.info("class name is "+className);
+					String packageName=BaseIpCfg.class.getPackage().getName();
+					try {
+						//通过反射获得BaseIpCfg的子类的实例，并调用子类的initDefaultValue初始化默认值
+						Class clazz=Class.forName(packageName+"."+className);
+						BaseIpCfg ipcfg=(BaseIpCfg)clazz.newInstance();
+						ipcfg.setTableName(tableName);
+						ipcfg.initDefaultValue();
+						model.addAttribute("_ipCfg", ipcfg);
+					} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+						// TODO Auto-generated catch block
+						logger.error("打开新增IP窗口失败",e);
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		
+		return "/cfg/ipBlockForm";
+	}
+	/**
+	 * 
+	 * addIpPortCfg(新增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);
+		}
 		return "/cfg/ipBlockForm";
 	}
 	

src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java

@@ -0,0 +1,245 @@
+package com.nis.web.controller.configuration;
+
+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.SysDataDictionaryName;
+import com.nis.domain.SysMenu;
+import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.util.StringUtil;
+import com.nis.util.StringUtils;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/configuration/serviceDictInfo")
+public class ServiceDictInfoController extends BaseController {
+	
+
+	@ModelAttribute
+	public ServiceDictInfo get(@RequestParam(required=false) Integer serviceDictId) {
+		if (!StringUtil.isEmpty(serviceDictId)){
+			return serviceDictInfoService.getDictById(serviceDictId);
+		}else{
+			return new ServiceDictInfo();
+		}
+		
+		
+	}
+	
+	/**
+	 * 根据serviceDictId查出配置对象
+	 * @param serviceDictId
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "loadDataDict")
+	public ServiceDictInfo loadDataDict(@RequestParam(required=false) Integer serviceDictId,HttpServletRequest request, HttpServletResponse response, Model model){
+		
+		return serviceDictInfoService.getDictById(serviceDictId);
+	}
+	
+	
+	/**
+	 * 查询业务辅助表-业务字典信息列表
+	 * @param serviceDictInfo
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) {
+		
+		Page<ServiceDictInfo> page = serviceDictInfoService.findDictList(new Page<ServiceDictInfo>(request, response), serviceDictInfo);
+        model.addAttribute("page", page);
+       
+		return "/cfg/serviceDictList";
+	}
+	
+	/**
+	 * 进入添加或修改页面
+	 * @param serviceDictInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value={"form"})
+	public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction) {
+		if(doAction!=null&&doAction.equals("0")){
+			return "/cfg/serviceDictInfo";
+		}
+		return "/cfg/serviceDictForm";
+	}
+	/**
+	 * 新增或修改
+	 * @param serviceDictInfo
+	 * @param model
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:edit")
+	@RequestMapping(value = "saveOrUpdate")
+	public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes) {
+		
+		try {
+			serviceDictInfoService.saveOrUpdate(serviceDictInfo);
+			addMessage(redirectAttributes, "保存配置成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "保存配置失败！");
+		}
+		
+		return "redirect:" + adminPath + "/configuration/serviceDictInfo/list";
+	}
+	
+	
+	/**
+	 * 删除
+	 * @param serviceDictInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value={"delete"})
+	public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes) {
+		try {
+			serviceDictInfoService.deleteDict(serviceDictInfo);
+			addMessage(redirectAttributes, "删除配置成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "删除配置失败！");
+		}
+		return "redirect:" + adminPath + "/configuration/serviceDictInfo/list";
+	}
+	
+	
+	/**
+	 * isShowHide是否显示隐藏菜单
+	 * @param extId
+	 * @param isShowHidden
+	 * @param response
+	 * @return
+	 */
+	@RequiresPermissions("user")
+	@ResponseBody
+	@RequestMapping(value = "treeData")
+	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response) {
+		List<Map<String, Object>> mapList = Lists.newArrayList();
+		List<ServiceDictInfo> list = serviceDictInfoService.findAllDict();
+		for (int i=0; i<list.size(); i++){
+			ServiceDictInfo serviceDictInfo = list.get(i);
+			if (StringUtils.isBlank(extId) || (extId !=null && !extId.equals(serviceDictInfo.getServiceDictId().toString()))) {
+				if(isShowHide != null && isShowHide.equals("0") && serviceDictInfo.getIsValid().equals(0)){
+					continue;
+				}
+				Map<String, Object> map = Maps.newHashMap();
+				map.put("id", serviceDictInfo.getServiceDictId());
+				map.put("pId", serviceDictInfo.getParent().getServiceDictId());
+				map.put("name",serviceDictInfo.getItemValue());
+				mapList.add(map);
+			}
+		}
+		return mapList;
+	}
+	
+	
+	
+	
+	//标签配置
+	
+	
+	
+	
+	/**
+	 * 进入添加或修改页面
+	 * @param serviceDictInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value={"markForm"})
+	public String markForm(ServiceDictInfo serviceDictInfo, Model model,String doAction) {
+		if(doAction!=null&&doAction.equals("0")){
+			return "/cfg/serviceDictMarkInfo";
+		}
+		return "/cfg/serviceDictMarkForm";
+	}
+	
+	
+	/**
+	 * 查询业务辅助表-业务字典信息列表
+	 * @param serviceDictInfo
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:view")
+	@RequestMapping(value = {"markList"})
+	public String markList(ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) {
+		
+		Page<ServiceDictInfo> page = serviceDictInfoService.findDictMarkList(new Page<ServiceDictInfo>(request, response), serviceDictInfo);
+        model.addAttribute("page", page);
+       
+		return "/cfg/serviceDictMarkList";
+	}
+	
+	
+	/**
+	 * 新增或修改
+	 * @param serviceDictInfo
+	 * @param model
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:edit")
+	@RequestMapping(value = "markSaveOrUpdate")
+	public String markSaveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes) {
+		
+		try {
+			serviceDictInfoService.saveOrUpdate(serviceDictInfo);
+			addMessage(redirectAttributes, "保存配置成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "保存配置失败！");
+		}
+		
+		return "redirect:" + adminPath + "/configuration/serviceDictInfo/markList";
+	}
+	
+	
+	/**
+	 * 删除
+	 * @param serviceDictInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value={"markDelete"})
+	public String markDelete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes) {
+		try {
+			serviceDictInfoService.deleteDict(serviceDictInfo);
+			addMessage(redirectAttributes, "删除配置成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "删除配置失败！");
+		}
+		return "redirect:" + adminPath + "/configuration/serviceDictInfo/markList";
+	}
+	
+}

src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java

@@ -0,0 +1,131 @@
+package com.nis.web.controller.configuration;
+
+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.configuration.SysDictInfo;
+import com.nis.util.StringUtil;
+import com.nis.util.StringUtils;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/configuration/sysDictInfo")
+public class SysDictInfoController extends BaseController {
+	
+
+	@ModelAttribute
+	public SysDictInfo get(@RequestParam(required=false) Integer sysDictId) {
+		if (!StringUtil.isEmpty(sysDictId)){
+			return sysDictInfoService.getDictById(sysDictId);
+		}else{
+			return new SysDictInfo();
+		}
+		
+		
+	}
+	
+	/**
+	 * 根据sysDictId查出配置对象
+	 * @param sysDictId
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "loadDataDict")
+	public SysDictInfo loadDataDict(@RequestParam(required=false) Integer sysDictId,HttpServletRequest request, HttpServletResponse response, Model model){
+		
+		return sysDictInfoService.getDictById(sysDictId);
+	}
+	
+	
+	/**
+	 * 查询业务辅助表-生效范围系统字典信息列表
+	 * @param sysDictInfo
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(SysDictInfo sysDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) {
+		
+		Page<SysDictInfo> page = sysDictInfoService.findDictList(new Page<SysDictInfo>(request, response), sysDictInfo);
+        model.addAttribute("page", page);
+       
+		return "/cfg/sysDictList";
+	}
+	
+	/**
+	 * 进入添加或修改页面
+	 * @param sysDictInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value={"form"})
+	public String form(SysDictInfo sysDictInfo, Model model,String doAction) {
+		if(doAction!=null&&doAction.equals("0")){
+			return "/cfg/sysDictInfo";
+		}
+		return "/cfg/sysDictForm";
+	}
+	/**
+	 * 新增或修改
+	 * @param sysDictInfo
+	 * @param model
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:edit")
+	@RequestMapping(value = "saveOrUpdate")
+	public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes) {
+		
+		try {
+			sysDictInfoService.saveOrUpdate(sysDictInfo);
+			addMessage(redirectAttributes, "保存配置成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "保存配置失败！");
+		}
+		
+		return "redirect:" + adminPath + "/configuration/sysDictInfo/list";
+	}
+	
+	
+	/**
+	 * 删除
+	 * @param sysDictInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value={"delete"})
+	public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes) {
+		try {
+			sysDictInfoService.deleteDict(sysDictInfo);
+			addMessage(redirectAttributes, "删除配置成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "删除配置失败！");
+		}
+		return "redirect:" + adminPath + "/configuration/sysDictInfo/list";
+	}
+	
+	
+}

src/main/java/com/nis/web/dao/configuration/IpCfgDao.java

@@ -1,11 +1,26 @@
 package com.nis.web.dao.configuration;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
 
 /**
  * IP相关配置数据处理类
  * @author dell
  *
  */
-public class IpCfgDao {
-
+@MyBatisDao
+public interface IpCfgDao extends CrudDao<BaseIpCfg>{
+	public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ;
+	public BaseIpCfg get(BaseIpCfg entity) ;
+	public List<BaseIpCfg> findList(BaseIpCfg entity) ;
+	public List<BaseIpCfg> findAllList(BaseIpCfg entity) ;
+	public int insert(BaseIpCfg entity) ;
+	public int updateByPrimaryKeySelective(BaseIpCfg entity) ;
+	public int updateValid(BaseIpCfg entity) ;
+	public int delete(BaseIpCfg entity) ;
 }

src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml

@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.configuration.IpCfgDao" >
+  <resultMap id="BaseIpMap" type="com.nis.domain.configuration.BaseIpCfg" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
+    <result column="src_ip" property="srcIp" jdbcType="VARCHAR" />
+    <result column="src_ip_mask" property="srcIpMask" jdbcType="VARCHAR" />
+    <result column="src_port" property="srcPort" jdbcType="VARCHAR" />
+    <result column="src_port_mask" property="srcPortMask" jdbcType="VARCHAR" />
+    <result column="dst_ip" property="dstIp" jdbcType="VARCHAR" />
+    <result column="dst_ip_mask" property="dstIpMask" jdbcType="VARCHAR" />
+    <result column="dst_port" property="dstPort" jdbcType="VARCHAR" />
+    <result column="dst_port_mask" property="srcPortMask" jdbcType="VARCHAR" />
+    <result column="direction" property="direction" jdbcType="INTEGER" />
+    <result column="protocol" property="protocol" jdbcType="INTEGER" />
+    <result column="protocol_id" property="protocolId" jdbcType="INTEGER" />
+    <result column="action" property="action" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+    <result column="classify" property="classify" jdbcType="VARCHAR" />
+    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+    <result column="lable" property="lable" jdbcType="VARCHAR" />
+    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+  </resultMap>
+  <resultMap id="FtpIpMap" type="com.nis.domain.configuration.FtpIpCfg" extends="BaseIpMap" />
+  <resultMap id="HttpIpMap" type="com.nis.domain.configuration.HttpIpCfg" extends="BaseIpMap" />
+  <resultMap id="L2tpIpMap" type="com.nis.domain.configuration.L2tpIpCfg" extends="BaseIpMap" />
+  <resultMap id="MailIpMap" type="com.nis.domain.configuration.MailIpCfg" extends="BaseIpMap" />
+  <resultMap id="MmsIpMap" type="com.nis.domain.configuration.MmsIpCfg" extends="BaseIpMap" />
+  <resultMap id="OpenvpnIpMap" type="com.nis.domain.configuration.OpenvpnIpCfg" extends="BaseIpMap" />
+  <resultMap id="PptpIpMap" type="com.nis.domain.configuration.PptpIpCfg" extends="BaseIpMap" />
+  <resultMap id="RtmpIpMap" type="com.nis.domain.configuration.RtmpIpCfg" extends="BaseIpMap" />
+  <resultMap id="RtpIpMap" type="com.nis.domain.configuration.RtpIpCfg" extends="BaseIpMap" />
+  <resultMap id="RtspIpMap" type="com.nis.domain.configuration.RtspIpCfg" extends="BaseIpMap" />
+  <resultMap id="SipIpMap" type="com.nis.domain.configuration.SipIpCfg" extends="BaseIpMap" />
+  <resultMap id="SshIpMap" type="com.nis.domain.configuration.SshIpCfg" extends="BaseIpMap" />
+  <resultMap id="SslIpMap" type="com.nis.domain.configuration.SslIpCfg" extends="BaseIpMap" />
+  
+  <sql id="BaseIpCfg_Column_List_with_id" >
+    CFG_ID, CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT, 
+    SRC_PORT_MASK ,DST_IP ,DST_IP_MASK, DST_PORT, DST_PORT_MASK,
+    DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
+    CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
+    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
+    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS
+  </sql>
+  <sql id="BaseIpCfg_Column_List" >
+    CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT, 
+    SRC_PORT_MASK ,DST_IP ,DST_IP_MASK, DST_PORT, DST_PORT_MASK,
+    DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
+    CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
+    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
+    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS
+  </sql>
+  <sql id="BaseIpCfg_Value_List" >
+    #{cfgDesc,jdbcType=VARCHAR},#{ipType,jdbcType=INTEGER}, 
+    #{srcIp,jdbcType=VARCHAR},#{srcIpMask,jdbcType=VARCHAR},#{srcPort,jdbcType=VARCHAR}, 
+	#{srcPortMask,jdbcType=VARCHAR},#{dstIp,jdbcType=VARCHAR},#{dstIpMask,jdbcType=VARCHAR},
+	#{dstPort,jdbcType=VARCHAR},#{dstPortMask,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+    #{protocol,jdbcType=INTEGER},#{protocolId,jdbcType=INTEGER},#{action,jdbcType=INTEGER}, 
+    #{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{creatorId,jdbcType=INTEGER}, 
+    #{createTime,jdbcType=TIMESTAMP},#{editorId,jdbcType=INTEGER},#{editTime,jdbcType=TIMESTAMP}, 
+    #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, 
+    #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER},
+    #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR},
+    #{areaEffectiveIds,jdbcType=VARCHAR}
+  </sql>
+  <select id="getById" resultMap="BaseIpMap" parameterType="java.lang.Long" >
+    SELECT 
+    <include refid="BaseIpCfg_Column_List_with_id" />
+    FROM ${tableName}
+    WHERE CFG_ID = #{cfgId,jdbcType=BIGINT}
+  </select>
+  <select id="get" resultMap="BaseIpMap" >
+    SELECT 
+    <include refid="BaseIpCfg_Column_List_with_id" />
+    FROM ${tableName}
+    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+    	<if test="cfgId != null">
+    		CFG_ID=#{cfgId,jdbcType=BIGINT}
+    	</if>
+    	<if test="cfgDesc != null">
+    		CFG_DESC=#{cfgDesc,jdbcType=VARCHAR}
+    	</if>
+    	<if test="ipType != null">
+    		IP_TYPE=#{ipType,jdbcType=INTEGER}
+    	</if>
+    	<if test="srcIp != null">
+    		SRC_IP=#{srcIp,jdbcType=VARCHAR}
+    	</if>
+    	<if test="srcIpMask != null">
+    		SRC_IP_MASK=#{srcIpMask,jdbcType=VARCHAR}
+    	</if>
+    	<if test="srcPort != null">
+    		SRC_PORT=#{srcPort,jdbcType=VARCHAR}
+    	</if>
+    	<if test="srcPortMask != null">
+    		SRC_PORT_MASK=#{srcPortMask,jdbcType=VARCHAR}
+    	</if>
+    	<if test="dstIp != null">
+    		DST_IP=#{dstIp,jdbcType=VARCHAR}
+    	</if>
+    	<if test="dstIpMask != null">
+    		DST_IP_MASK=#{dstIpMask,jdbcType=VARCHAR}
+    	</if>
+    	<if test="dstPort != null">
+    		DST_PORT=#{dstPort,jdbcType=VARCHAR}
+    	</if>
+    	<if test="dstPortMask != null">
+    		DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR}
+    	</if>
+    	<if test="direction != null">
+    		DIRECTION=#{direction,jdbcType=INTEGER}
+    	</if>
+    	<if test="protocol != null">
+    		PROTOCOL=#{protocol,jdbcType=INTEGER}
+    	</if>
+    	<if test="protocolId != null">
+    		PROTOCOL_ID=#{protocolId,jdbcType=INTEGER}
+    	</if>
+    	<if test="action != null">
+    		ACTION=#{action,jdbcType=INTEGER}
+    	</if>
+    	<if test="isValid != null">
+    		IS_VALID=#{isValid,jdbcType=INTEGER}
+    	</if>
+    	<if test="isAudit != null">
+    		IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+    	</if>
+    	<if test="creatorId != null">
+    		CREATOR_ID=#{creatorId,jdbcType=INTEGER}
+    	</if>
+    	<if test="createTime != null">
+    		CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+    	</if>
+    	<if test="editorId != null">
+    		EDITOR_ID=#{editorId,jdbcType=INTEGER}
+    	</if>
+    	<if test="editTime != null">
+    		EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+    	</if>
+    	<if test="auditorId != null">
+    		AUDITOR_ID=#{auditorId,jdbcType=INTEGER}
+    	</if>
+    	<if test="auditTime != null">
+    		AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+    	</if>
+    	<if test="serviceId != null">
+    		SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+    	</if>
+    	<if test="requestId != null">
+    		REQUEST_ID=#{requestId,jdbcType=INTEGER}
+    	</if>
+    	<if test="compileId != null">
+    		COMPILE_ID=#{compileId,jdbcType=INTEGER}
+    	</if>
+    	<if test="isAreaEffective != null">
+    		IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+    	</if>
+    	<if test="classify != null">
+    		classify=#{classify,jdbcType=VARCHAR}
+    	</if>
+    	<if test="attribute != null">
+    		attribute=#{attribute,jdbcType=VARCHAR}
+    	</if>
+    	<if test="lable != null">
+    		lable=#{lable,jdbcType=VARCHAR}
+    	</if>
+    	<if test="areaEffectiveIds != null">
+    		AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR}
+    	</if>
+    </trim>
+  </select>
+  <select id="findList" resultMap="BaseIpMap">
+		select 
+		<choose>
+			<when test="page !=null and page.fields != null and page.fields != ''">
+				 ${page.fields}
+			</when>
+			<otherwise>
+				<include refid="BaseIpCfg_Column_List_with_id"/>	
+			</otherwise>
+		</choose>
+		from ${tableName}
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="page !=null and page.where != null and page.where != ''">
+			AND ${page.where}
+			</if>
+		</trim>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY CFG_ID desc
+			</otherwise>
+		</choose>
+  </select>
+  <insert id="insert" parameterType="com.nis.domain.configuration.BaseIpCfg" >
+    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
+    	SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ${tableName} (
+     <include refid="BaseIpCfg_Column_List" />
+    )values (
+     <include refid="BaseIpCfg_Value_List" />
+    )
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.nis.domain.configuration.BaseIpCfg" >
+    update ${tableName}
+    <set >
+      <if test="cfgDesc != null" >
+        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="ipType != null" >
+        ip_type = #{ipType,jdbcType=INTEGER},
+      </if>
+      <if test="srcIp != null" >
+        src_ip = #{srcIp,jdbcType=VARCHAR},
+      </if>
+      <if test="srcIpMask != null" >
+        src_ip_mask = #{srcIpMask,jdbcType=VARCHAR},
+      </if>
+      <if test="srcPort != null" >
+        src_port = #{srcPort,jdbcType=VARCHAR},
+      </if>
+      <if test="srcPortMask != null" >
+        src_port_mask = #{srcPortMask,jdbcType=VARCHAR},
+      </if>
+      <if test="dstIp != null" >
+        dst_ip = #{dstIp,jdbcType=VARCHAR},
+      </if>
+      <if test="dstIpMask != null" >
+        dst_ip_mask = #{dstIpMask,jdbcType=VARCHAR},
+      </if>
+      <if test="dstPort != null" >
+        dst_port = #{dstPort,jdbcType=VARCHAR},
+      </if>
+      <if test="srcPortMask != null" >
+        dst_port_mask = #{srcPortMask,jdbcType=VARCHAR},
+      </if>
+      <if test="direction != null" >
+        direction = #{direction,jdbcType=INTEGER},
+      </if>
+      <if test="protocol != null" >
+        protocol = #{protocol,jdbcType=INTEGER},
+      </if>
+      <if test="protocolId != null" >
+        protocol_id = #{protocolId,jdbcType=INTEGER},
+      </if>
+      <if test="action != null" >
+        action = #{action,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null" >
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null" >
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null" >
+        edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorId != null" >
+        auditor_id = #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null" >
+        audit_time = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="serviceId != null" >
+        service_id = #{serviceId,jdbcType=INTEGER},
+      </if>
+      <if test="requestId != null" >
+        request_id = #{requestId,jdbcType=INTEGER},
+      </if>
+      <if test="compileId != null" >
+        compile_id = #{compileId,jdbcType=INTEGER},
+      </if>
+      <if test="isAreaEffective != null" >
+        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null" >
+        classify = #{classify,jdbcType=VARCHAR},
+      </if>
+      <if test="attribute != null" >
+        attribute = #{attribute,jdbcType=VARCHAR},
+      </if>
+      <if test="lable != null" >
+        lable = #{lable,jdbcType=VARCHAR},
+      </if>
+      <if test="areaEffectiveIds != null" >
+        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR}
+      </if>
+    </set>
+    where cfg_id = #{cfgId,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java

@@ -0,0 +1,50 @@
+package com.nis.web.dao.configuration;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface ServiceDictInfoDao extends CrudDao<ServiceDictInfo> {
+	
+	/**
+	 * 查询分类性质字典列表，
+	 * @param serviceDictInfo
+	 * @return
+	 */
+	List<ServiceDictInfo> findDictList(ServiceDictInfo serviceDictInfo);
+	
+	/**
+	 * 查询标签字典列表
+	 * @param serviceDictInfo
+	 * @return
+	 */
+	List<ServiceDictInfo> findDictMarkList(ServiceDictInfo serviceDictInfo);
+	
+
+    /**
+     * 添加字典信息
+     * @param serviceDictInfo
+     */
+	void insertDict(ServiceDictInfo serviceDictInfo);
+
+	/**
+	 * 根据主键查询字典详细信息
+	 * @param serviceDictId
+	 * @return
+	 */
+	ServiceDictInfo getDictById(Integer serviceDictId);
+	
+    /**
+     * 查询所有非叶子节点字典配置信息
+     * @return
+     */
+	List<ServiceDictInfo> findAllDict();
+
+	
+	
+}

src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.configuration.ServiceDictInfoDao" >
+  
+  <resultMap id="dictResultMap" type="com.nis.domain.configuration.ServiceDictInfo" >
+    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+     <!-- 父id -->
+	    <association property="parent" javaType="com.nis.domain.configuration.ServiceDictInfo">
+	     <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+	    </association>
+	 <!-- 创建人员 -->
+        <association property="serviceDictCreator" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+	 <!-- 修改人员 -->
+        <association property="serviceDictEditor" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+  </resultMap>
+  
+    <sql id="serviceDictInfoColumns">
+		s.service_dict_id AS serviceDictId,
+		s.item_type AS itemType,
+		s.item_code AS itemCode,
+		s.item_value AS itemValue,
+		s.item_desc AS itemDesc,
+		s.parent_id AS "parent.serviceDictId",
+		s.is_leaf AS isLeaf,
+		s.is_valid AS isValid,
+		s.creator_id AS "serviceDictCreator.id",
+		s.create_time AS createTime,
+		s.editor_id AS "serviceDictEditor.id",
+		s.edit_time AS editTime
+	</sql>
+  
+  
+  
+  <!-- 查询分类性质列表 -->
+    <select id="findDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1 AND item_type <![CDATA[<>]]> 3
+	
+	<if test="itemType != null and itemType != '' " >
+      AND item_type like '%${itemType}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+ 
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+    <!-- 查询标签列表 -->
+    <select id="findDictMarkList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1 AND item_type=3
+	
+	<if test="itemType != null and itemType != '' " >
+      AND item_type like '%${itemType}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+ 
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+  <!-- 根据主键查询字典详细信息 -->
+  
+  <select id="getDictById" resultType="com.nis.domain.configuration.ServiceDictInfo">
+  select 
+  <include refid="serviceDictInfoColumns"/>
+  from service_dict_info s where s.service_dict_id = #{serviceDictId}
+  </select>
+  
+  
+  
+  <!-- 新增字典信息 -->
+  
+     <insert id="insertDict" parameterType="com.nis.domain.configuration.ServiceDictInfo" useGeneratedKeys="true" keyProperty="id" >
+    insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
+    values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, 
+             #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, 
+             #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, 
+             #{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+             #{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
+  </insert>
+  
+  
+  <!-- 查询非叶子节点的所有字典信息 -->
+  
+   <select id="findAllDict">
+   select 
+   <include refid="serviceDictInfoColumns" />
+   from service_dict_info s where   s.is_leaf = 0;
+   </select>
+  
+  <!-- 修改 -->
+  	<update id="update">
+		UPDATE service_dict_info s SET 
+	    s.service_dict_id = #{serviceDictId},
+		s.item_type = #{itemType},
+		s.item_code = #{itemCode},
+		s.item_value = #{itemValue},
+		s.item_desc = #{itemDesc},
+		s.parent_id = #{parent.serviceDictId},
+		s.is_leaf = #{isLeaf},
+		s.creator_id = #{serviceDictCreator.id},
+		s.editor_id = #{serviceDictEditor.id},
+		s.edit_time = #{editTime}
+		WHERE s.service_dict_id = #{serviceDictId}
+	</update>
+  
+  <!-- 删除 -->
+  
+  <update id="delete">
+  UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
+  </update>
+  
+ 
+</mapper>

src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java

@@ -0,0 +1,40 @@
+package com.nis.web.dao.configuration;
+
+import java.util.List;
+
+import com.nis.domain.configuration.SysDictInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
+	
+	/**
+	 * 查询生效范围字典列表，
+	 * @param sysDictInfo
+	 * @return
+	 */
+	List<SysDictInfo> findDictList(SysDictInfo sysDictInfo);
+	
+
+    /**
+     * 添加字典信息
+     * @param sysDictInfo
+     */
+	void insertDict(SysDictInfo sysDictInfo);
+
+	/**
+	 * 根据主键查询字典详细信息
+	 * @param sysDictId
+	 * @return
+	 */
+	SysDictInfo getDictById(Integer sysDictId);
+	
+    /**
+     * 查询所有非叶子节点字典配置信息
+     * @return
+     */
+	List<SysDictInfo> findAllDict();
+
+	
+}

src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.configuration.SysDictInfoDao" >
+  
+  <resultMap id="dictResultMap" type="com.nis.domain.configuration.SysDictInfo" >
+    <id column="sys_dict_id" property="sysDictId" jdbcType="INTEGER" />
+    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+     <!-- 父id -->
+	    <association property="parent" javaType="com.nis.domain.configuration.SysDictInfo">
+	     <id column="sys_dict_id" property="sysDictId" jdbcType="INTEGER" />
+	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+	    </association>
+	 <!-- 创建人员 -->
+        <association property="sysDictCreator" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+	 <!-- 修改人员 -->
+        <association property="sysDictEditor" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+  </resultMap>
+  
+    <sql id="sysDictInfoColumns">
+		s.sys_dict_id AS sysDictId,
+		s.item_type AS itemType,
+		s.item_code AS itemCode,
+		s.item_value AS itemValue,
+		s.item_desc AS itemDesc,
+		s.parent_id AS "parent.sysDictId",
+		s.is_leaf AS isLeaf,
+		s.is_valid AS isValid,
+		s.creator_id AS "sysDictCreator.id",
+		s.create_time AS createTime,
+		s.editor_id AS "sysDictEditor.id",
+		s.edit_time AS editTime
+	</sql>
+  
+  <!-- 查询分类性质列表  -->
+    <select id="findDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.SysDictInfo">
+	SELECT * FROM sys_dict_info WHERE  is_valid=1 
+	
+	<if test="itemType != null and itemType != '' " >
+      AND item_type like '%${itemType}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+ 
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+  <!-- 根据主键查询字典详细信息 -->
+  
+  <select id="getDictById" resultType="com.nis.domain.configuration.SysDictInfo">
+  select 
+  <include refid="sysDictInfoColumns"/>
+  from sys_dict_info s where s.sys_dict_id = #{sysDictId}
+  </select>
+  
+  <!-- 新增字典信息 -->
+  
+  <insert id="insertDict" parameterType="com.nis.domain.configuration.SysDictInfo" useGeneratedKeys="true" keyProperty="id" >
+    insert into sys_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
+    values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, 
+             #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, 
+             #{parent.sysDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, 
+             #{sysDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+             #{sysDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
+  </insert>
+  
+  
+  <!-- 查询非叶子节点的所有字典信息 -->
+  
+   <select id="findAllDict">
+   select 
+   <include refid="sysDictInfoColumns" />
+   from sys_dict_info s where   s.is_leaf = 0;
+   </select>
+  
+  <!-- 修改 -->
+  	<update id="update">
+		UPDATE sys_dict_info s SET 
+	    s.sys_dict_id = #{sysDictId},
+		s.item_type = #{itemType},
+		s.item_code = #{itemCode},
+		s.item_value = #{itemValue},
+		s.item_desc = #{itemDesc},
+		s.parent_id = #{parent.sysDictId},
+		s.is_leaf = #{isLeaf},
+		s.creator_id = #{sysDictCreator.id},
+		s.editor_id = #{sysDictEditor.id},
+		s.edit_time = #{editTime}
+		WHERE s.sys_dict_id = #{sysDictId}
+	</update>
+  
+  <!-- 删除 -->
+  
+  <update id="delete">
+  UPDATE sys_dict_info s set s.is_valid = #{isValid} where s.sys_dict_id = #{sysDictId}
+  </update>
+  
+ 
+</mapper>

src/main/java/com/nis/web/dao/systemService/ServiceConfigInfo.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.nis.web.dao.systemService.ServiceConfigInfoDao" >
-</mapper>

src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java

@@ -1,5 +1,11 @@
 package com.nis.web.dao.systemService;
 
-public interface ServiceConfigInfoDao {
+import org.apache.ibatis.annotations.Param;
 
+import com.nis.domain.ServiceConfigInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+@MyBatisDao
+public interface ServiceConfigInfoDao extends CrudDao<ServiceConfigInfo>{
+	public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId);
 }

src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.systemService.ServiceConfigInfoDao" >
+	<resultMap id="serviceConfigInfo" type="com.nis.domain.ServiceConfigInfo">
+		<id column="id" property="id"/>
+	    <result column="table_name" property="tableName"/>
+	    <result column="table_desc" property="tableDesc"/>
+	    <result column="table_type" property="tableType"/>
+	    <result column="maat_table" property="maatTable"/>
+	    <result column="service_id" property="serviceId"/>
+	    <result column="is_valid" property="isValid"/>
+	</resultMap>
+	<select id="findSysServiceConfigInfo" resultType="serviceConfigInfo">
+		select
+			id,
+			table_name,
+			table_desc,
+			table_type,
+			maat_table,
+			service_id,
+			is_valid
+		from
+			service_config_info
+		where
+			service_id=#{service_id} and is_valid=1
+	</select>
+</mapper>

src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java

@@ -1,10 +1,11 @@
 package com.nis.web.dao.systemService;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.nis.domain.SystemServiceInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
 @MyBatisDao
 public interface SystemServiceInfoDao extends CrudDao<SystemServiceInfo> {
-
 }

src/main/java/com/nis/web/service/BaseService.java

@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.Lists;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
+import com.nis.util.Configurations;
 import com.nis.util.StringUtils;
 
 /**
@@ -142,8 +143,32 @@ public abstract class BaseService {
 		
 		return scopeSql.toString();
 	}
-	
-	
+	/**
+	 * 
+	 * getTableName(获取Class对应的表名)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param clazz
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public String getTableName(String clazz){
+		return Configurations.getStringProperty(clazz, null);
+	}
+	/**
+	 * 
+	 * getTableName(获取表名对应的Class)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param clazz
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public String getClassName(String tableName){
+		return Configurations.getStringProperty(tableName, null);
+	}
 	
 	
 	

src/main/java/com/nis/web/service/CrudService.java

@@ -3,7 +3,6 @@
  */
 package com.nis.web.service;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 import org.apache.ibatis.session.ExecutorType;
@@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nis.domain.BaseEntity;
 import com.nis.domain.Page;
-import com.nis.util.Constants;
 import com.nis.web.dao.CrudDao;
 
 /**

src/main/java/com/nis/web/service/configuration/IpCfgService.java

@@ -1,13 +1,88 @@
 package com.nis.web.service.configuration;
 
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.web.dao.configuration.IpCfgDao;
+import com.nis.web.service.CrudService;
+
 /**
  * IP相关配置事务类
  * @author dell
  *
  */
 @Service
-public class IpCfgService {
-
+public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
+	@Autowired
+	protected IpCfgDao ipCfgDao;
+	/**
+	 * 
+	 * addIpCfg(新增IP类配置)
+	 * (继承BaseIpCfg这个类方可使用)
+	 * @param baseIpCfg
+	 * @return 
+	 *int
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public int addIpCfg(BaseIpCfg baseIpCfg){
+		String tableName=getTableName(baseIpCfg.getClass().getSimpleName());
+		if(StringUtils.isBlank(tableName))
+			return 0;
+		baseIpCfg.setTableName(tableName);
+		logger.info("save "+tableName);
+		return ipCfgDao.insert(baseIpCfg);
+	} 
+	/**
+	 * 
+	 * updateIpCfg(更新IP类配置)
+	 * (继承BaseIpCfg这个类方可使用)
+	 * @param baseIpCfg
+	 * @return 
+	 *int
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public int updateIpCfg(BaseIpCfg baseIpCfg){
+		String tableName=getTableName(baseIpCfg.getClass().getSimpleName());
+		baseIpCfg.setTableName(tableName);
+		logger.info("update "+tableName);
+		return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg);
+	} 
+	/**
+	 * 
+	 * getIpCfg(根据IP与类名获取IP配置)
+	 * (继承BaseIpCfg这个类方可使用)
+	 * @param clazz
+	 * @param id
+	 * @return 
+	 *BaseIpCfg
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public BaseIpCfg getIpCfgById(Class<?> clazz,long id){
+		String tableName=getTableName(clazz.getSimpleName());
+		logger.info("get "+tableName);
+		return ipCfgDao.getById(tableName, id);
+	}
+	/**
+	 * 
+	 * getIpCfg(根据IP与类名获取IP配置)
+	 * (继承BaseIpCfg这个类方可使用)
+	 * @param clazz
+	 * @param id
+	 * @return 
+	 *BaseIpCfg
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){
+		String tableName=getTableName(baseIpCfg.getClass().getSimpleName());
+		baseIpCfg.setTableName(tableName);
+		logger.info("get "+tableName);
+		return ipCfgDao.get(baseIpCfg);
+	}
+	
 }

src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java

@@ -0,0 +1,120 @@
+package com.nis.web.service.configuration;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Lists;
+import com.nis.domain.Page;
+import com.nis.domain.SysDataDictionaryItem;
+import com.nis.domain.SysMenu;
+import com.nis.domain.SysUser;
+import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.util.DateUtil;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.configuration.ServiceDictInfoDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+
+@Service
+public class ServiceDictInfoService extends BaseService{
+	
+	@Autowired
+     private ServiceDictInfoDao serviceDictInfoDao;
+	
+	/**
+	 * 查询分类性质字典分页
+	 * @param page
+	 * @param serviceDictInfo
+	 * @return
+	 */
+	public Page<ServiceDictInfo> findDictList(Page<ServiceDictInfo> page, ServiceDictInfo serviceDictInfo) {
+		// 设置分页参数 
+		serviceDictInfo.setPage(page);
+		// 执行分页查询
+		List<ServiceDictInfo> list = Lists.newArrayList();
+		List<ServiceDictInfo> sourcelist = serviceDictInfoDao.findDictList(serviceDictInfo);
+		ServiceDictInfo.sortList(list, sourcelist, 0l, true);
+		page.setList(sourcelist);
+		return page;
+	}
+	
+	/**
+	 * 查询标签分页
+	 * @param page
+	 * @param serviceDictInfo
+	 * @return
+	 */
+	public Page<ServiceDictInfo> findDictMarkList(Page<ServiceDictInfo> page, ServiceDictInfo serviceDictInfo) {
+		// 设置分页参数 
+				serviceDictInfo.setPage(page);
+				// 执行分页查询
+				List<ServiceDictInfo> list = Lists.newArrayList();
+				List<ServiceDictInfo> sourcelist = serviceDictInfoDao.findDictMarkList(serviceDictInfo);
+				ServiceDictInfo.sortList(list, sourcelist, 0l, true);
+				page.setList(sourcelist);
+				return page;
+	}
+	
+
+	/**
+	 * 根据主键查询字典详细信息
+	 * @param serviceDictId
+	 * @return
+	 */
+	public ServiceDictInfo getDictById(Integer serviceDictId) {
+		return serviceDictInfoDao.getDictById(serviceDictId);
+	}
+
+	/**
+	 * 新增或修改业务字典表
+	 * @param serviceDictInfo
+	 */
+	public void saveOrUpdate(ServiceDictInfo serviceDictInfo) {
+		SysUser user = UserUtils.getUser();
+      if(StringUtil.isEmpty(serviceDictInfo.getServiceDictId())) {//新增
+    	  serviceDictInfo.setIsValid(1);
+    	  serviceDictInfo.setServiceDictCreator(user);
+    	  serviceDictInfo.setCreateTime(new Date());
+    	  serviceDictInfo.setServiceDictEditor(user);
+		  serviceDictInfo.setEditTime(serviceDictInfo.getCreateTime());
+		  if(serviceDictInfo.getParent()==null||(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()==null)){
+			  ServiceDictInfo parent = new ServiceDictInfo();
+			  parent.setServiceDictId(0);
+			  serviceDictInfo.setParent(parent);
+		  }
+    	  serviceDictInfoDao.insertDict(serviceDictInfo);
+    	  
+		}
+      
+      else {//修改
+    	  serviceDictInfo.setServiceDictEditor(user);
+    	  serviceDictInfo.setEditTime(new Date());
+    	  serviceDictInfoDao.update(serviceDictInfo);
+		}
+		
+	}
+
+	/**
+	 * 查询所有非叶子节点字典配置信息
+	 * @return
+	 */
+	public List<ServiceDictInfo> findAllDict() {
+		
+		return serviceDictInfoDao.findAllDict();
+	}
+
+	/**
+	 * 删除
+	 * @param serviceDictInfo
+	 */
+	public void deleteDict(ServiceDictInfo serviceDictInfo) {
+		serviceDictInfo.setIsValid(0);
+		serviceDictInfoDao.delete(serviceDictInfo);
+	}
+
+
+	
+}

src/main/java/com/nis/web/service/configuration/SysDictInfoService.java

@@ -0,0 +1,100 @@
+package com.nis.web.service.configuration;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Lists;
+import com.nis.domain.Page;
+import com.nis.domain.SysUser;
+import com.nis.domain.configuration.SysDictInfo;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.configuration.SysDictInfoDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+
+@Service
+public class SysDictInfoService extends BaseService{
+	
+	@Autowired
+     private SysDictInfoDao sysDictInfoDao;
+	
+	/**
+	 * 查询生效范围字典分页
+	 * @param page
+	 * @param sysDictInfo
+	 * @return
+	 */
+	public Page<SysDictInfo> findDictList(Page<SysDictInfo> page, SysDictInfo sysDictInfo) {
+		// 设置分页参数 
+		sysDictInfo.setPage(page);
+		// 执行分页查询
+		List<SysDictInfo> list = Lists.newArrayList();
+		List<SysDictInfo> sourcelist = sysDictInfoDao.findDictList(sysDictInfo);
+		SysDictInfo.sortList(list, sourcelist, 0, true);
+		page.setList(sourcelist);
+		return page;
+	}
+	
+
+	/**
+	 * 根据主键查询生效范围字典详细信息
+	 * @param sysDictId
+	 * @return
+	 */
+	public SysDictInfo getDictById(Integer sysDictId) {
+		return sysDictInfoDao.getDictById(sysDictId);
+	}
+
+	/**
+	 * 新增或修改生效范围字典表
+	 * @param sysDictInfo
+	 */
+	public void saveOrUpdate(SysDictInfo sysDictInfo) {
+		SysUser user = UserUtils.getUser();
+      if(StringUtil.isEmpty(sysDictInfo.getSysDictId())) {//新增
+    	  sysDictInfo.setIsValid(1);
+    	  sysDictInfo.setSysDictCreator(user);
+    	  sysDictInfo.setCreateTime(new Date());
+    	  sysDictInfo.setSysDictEditor(user);
+    	  sysDictInfo.setEditTime(sysDictInfo.getCreateTime());
+		  if(sysDictInfo.getParent()==null||(sysDictInfo.getParent()!=null&&sysDictInfo.getParent().getSysDictId()==null)){
+			  SysDictInfo parent = new SysDictInfo();
+			  parent.setSysDictId(0);
+			  sysDictInfo.setParent(parent);
+		  }
+    	  sysDictInfoDao.insertDict(sysDictInfo);
+    	  
+		}
+      
+      else {//修改
+    	  sysDictInfo.setSysDictEditor(user);
+    	  sysDictInfo.setEditTime(new Date());
+    	  sysDictInfoDao.update(sysDictInfo);
+		}
+		
+	}
+
+	/**
+	 * 查询所有非叶子节点生效范围字典配置信息
+	 * @return
+	 */
+	public List<SysDictInfo> findAllDict() {
+		
+		return sysDictInfoDao.findAllDict();
+	}
+
+	/**
+	 * 删除
+	 * @param sysDictInfo
+	 */
+	public void deleteDict(SysDictInfo sysDictInfo) {
+		sysDictInfo.setIsValid(0);
+		sysDictInfoDao.delete(sysDictInfo);
+	}
+
+
+	
+}

src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java

@@ -0,0 +1,16 @@
+package com.nis.web.service.systemService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.nis.domain.ServiceConfigInfo;
+import com.nis.web.dao.systemService.ServiceConfigInfoDao;
+
+@Service
+public class ServiceConfigInfoService {
+	@Autowired
+	protected ServiceConfigInfoDao serviceConfigInfoDao;
+	public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){
+		return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId);
+	}
+}