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

This commit is contained in:
wangxin
2018-05-17 15:35:31 +08:00
9 changed files with 286 additions and 0 deletions

View File

@@ -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);
}

View File

@@ -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>

View File

@@ -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);
}

View File

@@ -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>

View File

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

View File

@@ -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>

View File

@@ -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;
}