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

src/main/java/com/nis/domain/FunctionRegionDict.java

@@ -0,0 +1,77 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+public class FunctionRegionDict {
+	private Integer dictId;
+	private Integer functionId;
+	private String configRegion;
+	private String configDistrict;
+	private String configDesc;
+	private Integer isValid;
+	private Integer creatorId;
+	private Date creatTime;
+	private Integer editorId;
+	private Date editTime;
+	public Integer getDictId() {
+		return dictId;
+	}
+	public void setDictId(Integer dictId) {
+		this.dictId = dictId;
+	}
+	public Integer getFunctionId() {
+		return functionId;
+	}
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+	public String getConfigRegion() {
+		return configRegion;
+	}
+	public void setConfigRegion(String configRegion) {
+		this.configRegion = configRegion;
+	}
+	public String getConfigDistrict() {
+		return configDistrict;
+	}
+	public void setConfigDistrict(String configDistrict) {
+		this.configDistrict = configDistrict;
+	}
+	public String getConfigDesc() {
+		return configDesc;
+	}
+	public void setConfigDesc(String configDesc) {
+		this.configDesc = configDesc;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+	public Date getCreatTime() {
+		return creatTime;
+	}
+	public void setCreatTime(Date creatTime) {
+		this.creatTime = creatTime;
+	}
+	public Integer getEditorId() {
+		return editorId;
+	}
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	
+}

src/main/java/com/nis/domain/FunctionServiceDict.java

@@ -0,0 +1,91 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+public class FunctionServiceDict {
+	private Integer dictId;
+	private Integer functionId;
+	private Integer protocolId;
+	private Integer action;
+	private Integer serviceId;
+	private String serviceName;
+	private String serviceDesc;
+	private Integer isValid;
+	private Integer creatorId;
+	private Date creatTime;
+	private Integer editorId;
+	private Date editTime;
+	public Integer getDictId() {
+		return dictId;
+	}
+	public void setDictId(Integer dictId) {
+		this.dictId = dictId;
+	}
+	public Integer getFunctionId() {
+		return functionId;
+	}
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+	public Integer getProtocolId() {
+		return protocolId;
+	}
+	public void setProtocolId(Integer protocolId) {
+		this.protocolId = protocolId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
+	public String getServiceName() {
+		return serviceName;
+	}
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+	public String getServiceDesc() {
+		return serviceDesc;
+	}
+	public void setServiceDesc(String serviceDesc) {
+		this.serviceDesc = serviceDesc;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+	public Date getCreatTime() {
+		return creatTime;
+	}
+	public void setCreatTime(Date creatTime) {
+		this.creatTime = creatTime;
+	}
+	public Integer getEditorId() {
+		return editorId;
+	}
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	
+}

src/main/java/com/nis/web/dao/FunctionRegionDictDao.java

@@ -0,0 +1,10 @@
+package com.nis.web.dao;
+
+import java.util.List;
+
+import com.nis.domain.FunctionRegionDict;
+
+@MyBatisDao
+public interface FunctionRegionDictDao {
+	List<FunctionRegionDict> getListByFunctionId(Integer functionId);
+}

src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml

@@ -0,0 +1,26 @@
+<?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.FunctionRegionDictDao" >
+  <resultMap id="BaseResultMap" type="com.nis.domain.FunctionRegionDict" >
+    <id column="dict_id" property="dictId" jdbcType="INTEGER" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="config_region" property="configRegion" jdbcType="VARCHAR" />
+    <result column="config_district" property="configDistrict" jdbcType="VARCHAR" />
+    <result column="config_desc" property="configDesc" jdbcType="VARCHAR" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+  </resultMap>
+  
+  <sql id="Base_Column_List" >
+    dict_id, function_id, config_region, config_district, config_desc, is_valid
+  </sql>
+  <select id="getListByFunctionId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from function_region_dict
+    where function_id = #{functionId,jdbcType=INTEGER} and is_valid=1
+    <if test="configRegion != null and configRegion!=''">
+   		AND config_district=#{configRegion,jdbcType=VARCHAR}
+   	</if>
+  </select>
+ 
+</mapper>

src/main/java/com/nis/web/dao/FunctionServiceDictDao.java

@@ -0,0 +1,11 @@
+package com.nis.web.dao;
+
+import java.util.List;
+
+import com.nis.domain.FunctionServiceDict;
+
+@MyBatisDao
+public interface FunctionServiceDictDao {
+
+	List<FunctionServiceDict> getListByFunctionId(Integer functionId);
+}

src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml

@@ -0,0 +1,31 @@
+<?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.FunctionServiceDictDao" >
+  <resultMap id="BaseResultMap" type="com.nis.domain.FunctionServiceDict" >
+    <id column="dict_id" property="dictId" jdbcType="INTEGER" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="protocol_id" property="protocolId" jdbcType="INTEGER" />
+    <result column="action" property="action" jdbcType="INTEGER" />
+    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+    <result column="service_name" property="serviceName" jdbcType="VARCHAR" />
+    <result column="service_desc" property="serviceDesc" jdbcType="VARCHAR" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+  </resultMap>
+  
+  <sql id="Base_Column_List" >
+    dict_id, function_id, protocol_id, action, service_id, service_name,service_desc,is_valid
+  </sql>
+  <select id="getListByFunctionId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from function_service_dict
+    where function_id = #{functionId,jdbcType=INTEGER} and is_valid=1
+    <if test="protocolId != null">
+   		AND (protocol_id=#{protocolId,jdbcType=INTEGER} or protocol_id=0)
+   	</if>
+   	<if test="action != null">
+   		AND action=#{action,jdbcType=INTEGER}
+   	</if>
+  </select>
+ 
+</mapper>

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

@@ -0,0 +1,8 @@
+package com.nis.web.dao.configuration;
+
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface AvCfgDao {
+
+}

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

@@ -0,0 +1,5 @@
+<?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.AvCfgDao" >
+ 
+</mapper>

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

@@ -0,0 +1,27 @@
+package com.nis.web.service.configuration;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.nis.web.dao.FunctionRegionDictDao;
+import com.nis.web.dao.FunctionServiceDictDao;
+import com.nis.web.dao.configuration.AvCfgDao;
+import com.nis.web.service.CrudService;
+
+
+/**
+ * 特定协议相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class AvCfgService extends CrudService {
+	@Autowired
+	protected FunctionRegionDictDao functionRegionDictDao;
+	@Autowired
+	protected FunctionServiceDictDao functionServiceDictDao;
+	@Autowired
+	protected AvCfgDao avCfgDao;
+	
+}